De-dup two mediasource layout tests. Affected tests: http/tests/media/media-source/mediasource-addsourcebuffer.html http/tests/media/media-source/mediasource-is-type-supported.html The above were deleted after reconciling with their upstream WPT versions. Reconciling generally just adds new test conditions without removing any from the upstream version. The exception being the QuoteExceeded source buffer tests, where I've replicated the replacement of the original test with 2 new tests from the blink version. Change-Id: I2d3d483cf38e77eed3f26b5aab7fea0991a66723 Reviewed-on: https://chromium-review.googlesource.com/875161 Commit-Queue: Chrome Cunningham <chcunningham@chromium.org> Reviewed-by: Matthew Wolenetz <wolenetz@chromium.org> Cr-Commit-Position: refs/heads/master@{#531106} diff --git a/media-source/mediasource-addsourcebuffer.html b/media-source/mediasource-addsourcebuffer.html index 9fc9463..7f6aa2a 100644 --- a/media-source/mediasource-addsourcebuffer.html +++ b/media-source/mediasource-addsourcebuffer.html
@@ -21,7 +21,7 @@ mediasource_test(function(test, mediaElement, mediaSource) { - assert_throws(new TypeError(), + assert_throws({name: "TypeError"}, function() { mediaSource.addSourceBuffer(""); }, "addSourceBuffer() threw an exception when passed an empty string."); test.done(); @@ -43,7 +43,6 @@ test.done(); }, "Test addSourceBuffer() with unsupported type"); - mediasource_test(function(test, mediaElement, mediaSource) { var mimetype = 'video/webm;codecs="vp8,vorbis"'; @@ -83,7 +82,7 @@ var sourceBuffer = mediaSource.addSourceBuffer(mimetype); assert_true(sourceBuffer != null, "New SourceBuffer returned"); assert_equals(mediaSource.sourceBuffers[0], sourceBuffer, "SourceBuffer is in mediaSource.sourceBuffers"); - assert_equals(mediaSource.activeSourceBuffers.length, 0, "SourceBuffer is in mediaSource.activeSourceBuffers"); + assert_equals(mediaSource.activeSourceBuffers.length, 0, "SourceBuffer is not in mediaSource.activeSourceBuffers"); test.done(); }, "Test addSourceBuffer() video only"); @@ -96,7 +95,7 @@ var sourceBuffer = mediaSource.addSourceBuffer(mimetype); assert_true(sourceBuffer != null, "New SourceBuffer returned"); assert_equals(mediaSource.sourceBuffers[0], sourceBuffer, "SourceBuffer is in mediaSource.sourceBuffers"); - assert_equals(mediaSource.activeSourceBuffers.length, 0, "SourceBuffer is in mediaSource.activeSourceBuffers"); + assert_equals(mediaSource.activeSourceBuffers.length, 0, "SourceBuffer is not in mediaSource.activeSourceBuffers"); test.done(); }, "Test addSourceBuffer() audio only"); @@ -129,26 +128,6 @@ assert_equals(mediaSource.activeSourceBuffers.length, 0, "SourceBufferB is not in mediaSource.activeSourceBuffers"); test.done(); }, "Test addSourceBuffer() with AAC and H.264 in separate SourceBuffers"); - - mediasource_test(function(test, mediaElement, mediaSource) - { - var reachedLimit = false; - - // The 20 here is an arbitrary upper limit to make sure the test terminates. This test - // assumes that implementations won't support more than 20 SourceBuffers simultaneously. - for (var i = 0; i < 20; ++i) { - try { - mediaSource.addSourceBuffer(MediaSourceUtil.AUDIO_VIDEO_TYPE); - } catch(e) { - assert_equals(e.name, "QuotaExceededError"); - reachedLimit = true; - break; - } - } - assert_true(reachedLimit, "Reached SourceBuffer limit."); - test.done(); - }, "Test addSourceBuffer() QuotaExceededError."); - </script> </body> </html> 